git.openwrt.org Git - openwrt/openwrt.git/blob

   1 From ed0d78c75ca93c9f1d7f0d08ac5abe0de71fe312 Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
   3 Date: Thu, 16 May 2024 10:47:37 +0200
   4 Subject: [PATCH] ARM: dts: broadcom: convert NVMEM content to layout syntax
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 Use cleaner (and non-deprecated) bindings syntax. See commit
  10 bd912c991d2e ("dt-bindings: nvmem: layouts: add fixed-layout") for
  11 details.
  12
  13 Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
  14 Link: https://lore.kernel.org/r/20240516084737.2789-1-zajec5@gmail.com
  15 Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
  16 ---
  17  arch/arm/boot/dts/broadcom/bcm53016-meraki-mr32.dts  | 12 ++++++++----
  18  .../dts/broadcom/bcm958625-meraki-mx6x-common.dtsi   | 12 ++++++++----
  19  2 files changed, 16 insertions(+), 8 deletions(-)
  20
  21 --- a/arch/arm/boot/dts/broadcom/bcm53016-meraki-mr32.dts
  22 +++ b/arch/arm/boot/dts/broadcom/bcm53016-meraki-mr32.dts
  23 @@ -223,11 +223,15 @@
  24                 reg = <0x50>;
  25                 pagesize = <32>;
  26                 read-only;
  27 -               #address-cells = <1>;
  28 -               #size-cells = <1>;
  29
  30 -               mac_address: mac-address@66 {
  31 -                       reg = <0x66 0x6>;
  32 +               nvmem-layout {
  33 +                       compatible = "fixed-layout";
  34 +                       #address-cells = <1>;
  35 +                       #size-cells = <1>;
  36 +
  37 +                       mac_address: mac-address@66 {
  38 +                               reg = <0x66 0x6>;
  39 +                       };
  40                 };
  41         };
  42  };
  43 --- a/arch/arm/boot/dts/broadcom/bcm958625-meraki-mx6x-common.dtsi
  44 +++ b/arch/arm/boot/dts/broadcom/bcm958625-meraki-mx6x-common.dtsi
  45 @@ -55,11 +55,15 @@
  46                 reg = <0x50>;
  47                 pagesize = <32>;
  48                 read-only;
  49 -               #address-cells = <1>;
  50 -               #size-cells = <1>;
  51
  52 -               mac_address: mac-address@66 {
  53 -                       reg = <0x66 0x6>;
  54 +               nvmem-layout {
  55 +                       compatible = "fixed-layout";
  56 +                       #address-cells = <1>;
  57 +                       #size-cells = <1>;
  58 +
  59 +                       mac_address: mac-address@66 {
  60 +                               reg = <0x66 0x6>;
  61 +                       };
  62                 };
  63         };
  64  };